From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 22 Nov 2013 14:27:19 +0000 (+0100)
Subject: Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen into staging
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5890
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=93218d8a25eb6f492d4a3a43b6bebe0b151b9214;p=xen.git

Merge branch 'for-4.4.tmem' of git://xenbits.xen.org/people/konradwilk/xen into staging
---

93218d8a25eb6f492d4a3a43b6bebe0b151b9214
diff --cc xen/include/xen/tmem_xen.h
index 9fb7446237,034fd5c34a..b26c6faad9
--- a/xen/include/xen/tmem_xen.h
+++ b/xen/include/xen/tmem_xen.h
@@@ -439,10 -328,10 +328,10 @@@ typedef XEN_GUEST_HANDLE(char) cli_va_t
  typedef XEN_GUEST_HANDLE_PARAM(tmem_op_t) tmem_cli_op_t;
  typedef XEN_GUEST_HANDLE_PARAM(char) tmem_cli_va_param_t;
  
- static inline int tmh_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops)
+ static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops)
  {
  #ifdef CONFIG_COMPAT
 -    if ( is_hvm_vcpu(current) ?
 +    if ( has_hvm_container_vcpu(current) ?
           hvm_guest_x86_mode(current) != 8 :
           is_pv_32on64_vcpu(current) )
      {